Revision: bazaar--devel--1.2--patch-45
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Mon Feb  7 13:45:01 EST 2005
Standard-date: 2005-02-07 02:45:01 GMT
Modified-files: commands/resolved.c
    libarch/conflict-handling.c libarch/conflict-handling.h
    tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-17
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-45
    thelove@canonical.com/bazaar--devo--1.2--patch-13
    thelove@canonical.com/bazaar--devo--1.2--patch-14
    thelove@canonical.com/bazaar--devo--1.2--patch-15
Summary: merge with thelove
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-17
   (code feature) resolved now uses a rel_table instead

 * thelove@canonical.com/bazaar--devo--1.2--patch-13
   snap an inode sig when doing an update, if its safe to do so.

 * thelove@canonical.com/bazaar--devo--1.2--patch-14
   Updated conflict handling code to use a rel_table so that undo can use it too

 * thelove@canonical.com/bazaar--devo--1.2--patch-15
   sync with tla 1.3 and 1.4 up to its big merge from baz

